Fix for value '0'