[BUGFIX] E/W override