Fixed memory leak in 6.17 ;)