add support to handles fix #13