Fixed #52 issue