tweaked after 2.5 upgrade