fixing issue5 comment 66299365