Fixing activity submit to the way it was before the workaround.
FIxing issue #58 and #59