Issue#392

resolves #392