workaround 2 fixed