Attempt to preven RC widget issues