temp workaround for bugfix