bugfix: x and m were used together