Hopefully removed force close issues