Fixed (kind of) #553