Fix double creation time bug