Initial fix for cont-100