Closes #443