Trying to restore recent type of mapGenOptions.