0.6 fix