Fix for #483