Fixing widget crash, #94