closes #518

closes #518