possible fix to incorrect timestamps, still need better solution