Fixed #27 @Mte90