Fix first implementation