Changed boolean expression on ln 41