Fixing Blakes changes