Fix for widget