This is comment #SP-7 fixed