Fixed #59