1.0.12-d6.1 fix