Fix an small mistake and fix bool result