Change to avoid failure because of timing issue