Adding basic patch to fix UI bug mentioned above.