Added check for jsui