Tried fixing timing issue #2