sub and return changed @vjovanov

I forgot to commit this yesterday