axes fix for max_power
Merge remote-tracking branch 'origin/master'