Fix Issue #1 - Disable references in defaults for attributes