Urgent fix for LB-880