MOD: succesfully tested on brand new CE 1.9.0.0 and EE 1.14.0.0