Fix #301

This should match all cases.