Fixed: return values no longer "undefined".