Fix implementation workaround