Fixed minor timing issue