closes #579