Simpler fix without regexp checking both getter and setter