A slightly different attempt at a workaround