Issue#532

closes #532