Fix and close #275 - at least, I think so