Changed getter overriding to use Object.defineProperty