Fix to fix. Re-ordered IF statement. Really fixes specificity issue #1