Fixing a timing issue