modified workaround