#uibug fix on toggle