Bug fix for VIP & SVIP