Prevent leaks

Must be filled after version 2.14 is released