Keyword Test recorded step screenshots incorrectly assigned

So I have a keyword test, which I initially created by manually inserting some steps from a previous test and then added new steps using the "append to test" button to record some actions.  However, once those steps were processed, the screenshots that were automatically recorded for each step were assigned to the wrong actions.  Two of the screenshots were assigned to some of the the manual steps I had created, and all the rest were thus off by two:



As you can see, the bottom two have no screenshots at all, and the manual log and return step have screenshots for some reason.

I have two questions:

1 - What might be done to avoid this issue in the future?
2 - Now that the steps are already recorded, is there a way to manually associate a screenshot with a step?  It seems like there ought to be a way to manually associate screenshots, but if so I haven't found it yet.  

Any guidance would be appreciated.