Fixed #21 issue