3.0 specific patch: fix build error