Fix latest implementation