Fix for migration to 0.6