Fixing simplest implementations.