Fixed issue with chenge event on original element not triggering