Fix the other half of Issue 256 (annotation stacking)