fix for 0.6