fixes https://eucalyptus.atlassian.net/browse/TOOLS-354