Fixed #60 issue