Fixed bug in static catch-all.