Semi-revert, semi-fix for extra zeroes