Fix #36 issue