Fixing issue with custom routing