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

Change-Id: I6129b6d42d5f50d0a8ff0a0b68b9630e54f34ee2