No break after the return, fix errors from #78