fixed issue 2