Fixed resolve precedence. #SCL-5848 Fixed