Fixed getRaw function