Fix for #532