can not understand why match is not work with Cinch plugin, so refactoring