Fixed #55