Changed for new Handler implementation