This is a proposed fix to LBCORE-244