Fix: removed bug where injectig double handler where one was enough