Re-using handles which hopefully will cause fewer issues in the future