Minor fix to make more flexible with new widget