Fix creating and removing