FLEX-33904 memory fix