removed handler fix