Fixed implementation