Dirty fix for MID-1808.