Added the fix server and refactored a bit to make it work with the current matcher