m0ar bugfix