Fix for https://github.com/fabric8io/fabric8/issues/1901
Fix for https://github.com/fabric8io/fabric8/issues/1901