fixed handling of ui:define