fixed issue 3