Fix #2 issue