Fix timing issue