Resolve branch condition evaluation bug