workaround for #21