Handy fix for handling of handles.