Fixed: Conventions and force 1.7