Fixed Get and Set methods