fix for 1.0.12-d6.4