Possibly fixed issue for some things