Issue#424

resolves #424