Fixed to work with the new Handler