added fix for getters and setters