Attempt to fix strange new timing issue