Added fix for non-countable models