made tests pass with a workaround