fix for standard setup