s6 after review fixed error