Added ExpressionDecorator in order to fix float troubles