Work on fixing fragment crash