One of my earlier patches somehow got lost, fixed that