Issue#438

closes #438