Implementation fix