Fix widget issue