Fixed #62