Closes #348: add default back to code