fix for null class time problem