commit for @ChrisKdon to remove mem leak