[clike mode] Fixes #2596