Changed boolean expression on ln 128