fix with new version