Fix annotation border issue (bug 957034)