1. Fix Router Bug