Bug fix: return call was causing a short-circuit