added 1.7-R4 (1.7.10) compatibility