FIX to passing custom handles