CBLT-170:  fix arthmetic evaluation

Change-Id: I204b8d9040a0a8480dc47cadae9584d754b97ab4