fixed issue 24