Towards a more sophisticated MKWS-58 fix.