Quick fix for LB-1882