JB changes - fix crash an up