Fix for handle snippet