Fix for Widget