Fix command section handling.
0.0.18