bugfix memory-leak