Fix bug when only createdAt is enabled
Merge branch 'fix-created-at-bug'