Fix up mekanism