Fixes #1152. Bug with `else if match()`