#193 While fixing 192, I realized that I have to change a few things to
make merge easier.