temporary workaround to fix last test issues (temporary)