fixed issue 10