Fix for MID-2048