Bug fix for Expression, again.