Fixes problems with maruku