Issue#580 refresh

concerns #580