resolved #28 issue