Fixed: return value always.