Quick fix and new version