Attempt to fix mbl's problems