another bugfix related to support services