Fix for 0 value