Fix and add get