Fixed Mac Mismatch and Incomplete message errors

Credits: @0xTryCatch