Bug fix for new clients