Quick legacy handler fix