Fixed #1252, cheers @Royalot