new version with fix