Fix for handle list