FuMalik is fixed, some refactoring is performed