Fixed a wrong condition
Fixed a problem with the moduleAddHandler assignment