tried to fix equinox issues ...