Bugfix related to d91665a.