Fixes 1.6 compatibility problem.