Use SimpleExpression instead of Expression #574