removed potential cause of crashes