Fixed #3 issue