- Logic error fixed