FEND-982: Reader Comments getting lost