[Issue #77][WIP]Fixed reviewer comment