https://github.com/metawidget/metawidget/issues/21

Change-Id: I058a51358faaa8ba35fcf14c75d0bf022764853e