Fixes decimals issues