bug fix
remove getters & setters
bug fix