Fix Widget on 2.x, should fix #81
Merge