fix no more handles