Bug Fix after code review