Fixed #54