Fix for all MBS related issues in the future

Hopefully no one will open up new issues about MBS