Fix for submitting draft