Issue#620

concerns #620