Fix #52 issue