Issue#557

concerns #557