fix #30
improve handles fix #27