Fix bug
First draft test