Modify for changed type of return value