Implement workaround for #80