fix for lt & gt, new container types