Revert ""

This reverts commit 31fe1fb3afc5685c70c6346cd8fbc19064ce97fd.
Fixed a segmentation fault when running gam-create command.