fast fix for 1.4.7-R0.1