fixed printing to include non container as well