new version
potential fix for #2328