Fixes component/component.io#61