closes #426