Fix for negative values