new version for fix