adds handling for figure handles