Fixing find_widget