Fixed issue with contained items