closes #553