timing issue fixes