Fix #77, in the simplest way possible.