Fixed for lazy routes