Fixed to dispose method (also pushed to 8.36)