Fixing while testing