Move return declaration Fixes #issue 1