critical bug fix
Finished feature 63821686/yet-another-020-story.