Memory related fix