quick fix for missing entered_at