Fix for  #483