Fixed to work with 1.6.2-R0.1