Re #1211 fix initialization order