Fix for #363