wip again
working hack for IBM CloudFirst