Fix bug where handler was called multiple times.