Better handling of pitch set to 0.