Fix/2066 options precedence