change the workaround a little bit