Fixing issue with routing