Issue#586

closes #586
resolves #525