Created a better fix to fragment crash. Close #93