Fixed some missing lines in get/set method