Fix bug with top level returns