Fixing a workaround that was not working as expected.