simpler workaround