updated after bug fix 30595