Hopefully fix for custom route pages as well