Make fixtime more reliable