Improve detecting correct creation time