Bug fix for expression in 2.5/2.6