fixed issue 8