Issue 54. Widget performance fix.