U: fixed issue #16