added a workaround for LB-1050