Fixes fabric8io/fabric8#666