A bug fixed but still unfinished