Timing issues resolved