Fix mistakes in the previous commit (OMS-345)