Bug fix in self-serve api