fix for simple template clients