fix initialization order
Merge remote-tracking branch 'kde/master' into develop

* kde/master:
  fix initialization order