fixed issue 17