closes #559