Tweaked for a cause of crash