Updated to MaWBitR's version.