bug fix after review