Issue#565

concerns #565