Corrected bug with routing