Proposed fix for handling defaults when parsing external properties