Rearrange IF statement in hopes it will catch error in Issue #1