Fix for special cases about the base value