Fix it and add test