Fixing code..