Experiment with fixing #7.