Fix #56

Continuation of 9218392f.