Closes #426