closes #562