Fix #259 with magic I don't understand