fixed issue 1