fix that whole ordeal with occurred_at