fixed the inmemory mode for the latest changes