Fix for #490