Issue#385

closes #385