fixed Saturday crash