Relates to issue #245. Now the file size is not bloated.