fixing scheduling issue