Restack with bug fix to userdata