Fix to integer expression problem