Bugfix: Some uri matching failed.. ups