Attempting to fix issue #62
And fixing manual delayed upload