prevent Spanish inverted ?!
conflicts resolved