fixed issue 9