bugfix
Merge branch 'cancer_spike'