noConflict issue fix

Fix for issue #39