Fix for handle