Possibly fixed Fragment issue