Wall time fix