Fix #4 originally discovered in #2