noConflict support fix