Fix the previously found corner-case bug.