Fixed implementation.