Small workaround in match_controller for continuing client developement