Pushed fix for force close of MainActivity