Fixed #26 issue