Use JDispatcher to keep 2.5 compat