Fix for #572