Changed integer by long in expressions