Bug fix in stub