Fixed getter recursive errors