Fixed issue with M7 versions