Code

remove dependency on INVALID_LPE a bit