bugfix in match controller