FIX: handler routing fix