fixing #238 issue