closes #576