[issue #167][WIP][fixing minor bug]