Issue#402

concerns #402