closes #589