Temp hacky fix for MDEP-187 MDEP-98