Fixed #53