Bug fix on ExpressionTransformer