Fixing widget bug