Fixes #5679 using time_created if set