Refactors duplicate handler
Fixes