Tried fixing timing issue