Memory leak should be fixed