fix handles