Fix for legacy handler