Tweaked for Force Close