Comment 2 for bug 789588

I've attached a branch which adjusts the example so that it'll confirm this bug. Though, now we need to figure out how to attach the annotation automatically. I also confirmed the fix mentioned in the bug.