Fixing in-memory implementation.