Corrections to the fix of issue #35
Changed guest id property to constant