closes #561