After a workaround has been found