fixed issue 21