attach: fix after review