Fix wrong 'if' nesting...