Fix order when just 0 is in string