Quick fix to support timestamps