Change returning value to fix issue #17