bugfix workaround