fixed compilation
Merge remote-tracking branch 'sirherrbatka/Feature#1274'