Legislation drafted to change system loophole