fixed issue 6