Story fix. Most of the work was done in previous commit.