Fix wrong usage of container (OMS-507)