fixes points from Abi