Fixed getter issue