Fixed #62 issue