#70 fix for handles with margins