Modifies getter/setter to be less bad