cyb_61 fix after review