Blocking a user removes all their flags

Today I recognized that blocking a user (not deleting the user) will remove all their flags. I think this is a critical bug as if the user was blocked accidently and is reactivated later on he should still all their flags in place.
Problem is line 1176 and following:
the hook_user_cancel does not check the cancel method!!

Instead of

function flag_user_cancel($edit, $account, $method) {
  flag_user_account_removal($account);
}

it should be

function flag_user_cancel($edit, $account, $method) {
    if ($method != 'user_cancel_block' && $method != 'user_cancel_block_unpublish') {
        flag_user_account_removal($account);
    }
}