Fixed (kind of) #65.