Issue#424

concerns #424