Auto annotation changes unit number

With a custom built Component which has multiple Units, where each Unit resides in a different Hierarchical Sheet, when using auto Annotation with ["Use entire schematic"/"Keep existing annotations"/"Sort by X"/"Use first free number"] _all_ the Unit numbers changes of the Component in all Sheets leaving everything else (e.g. Wires) in place with Units swapped.

Looks like units change according to the sheet hierarchical ordering. e.g. If we originally had 3 Sheets with Component Units like: Sheet 1 - Unit 3, Sheet 2 - Unit 2, Sheet 3 - Unit 1, after Annotation it will be: S1-U1, S2-U2, S3-U3, where Sheet numbering goes from root Sheet downwards when viewed in Hierarchical Schematic Navigator.

If "Use the current page only" is used, after auto Annotation the Unit is changed to 1.

Possible workaround: annotate multi-unit parts manually and use "Keep existing annotations".

Application: Eeschema
Version: (2012-jan-04)-stable
Build: wxWidgets 2.8.12 (no debug,Unicode,compiler with C++ ABI 1002,GCC 4.7.1,wx containers,compatible with 2.6)
Platform: Linux 3.4.4-2-ARCH x86_64, 64 bit, Little endian, wxGTK
Options: USE_PNG_BITMAPS=ON
         KICAD_GOST=OFF
         USE_WX_GRAPHICS_CONTEXT=OFF
         USE_WX_OVERLAY=OFF
         USE_BOOST_POLYGON_LIBRARY