Fixed small states issue