fix a bit more for eucalyptus support