fixed app crashing on weekend