Commit 09d2a597 introduced the bug, which is due to using
single brackets conditions at the same time as *.

This commit should fix it and use double brackets everywhere
else.

Fixes #4699