Fix initial implementation