Fixing support for 0.6