Fixing code little bit