FIX return boolean value