Fix #544 issue about ElseIf blocks

w8 for tests