issue 12 fixed