fix to list popping and getting