Fix leak -- Fix #12