UiKit issue #101 fix