fixed issue 20