[BUG] add in missing returns