Bug fix for WB-863