workaround for bugfix