Fix auto generation strategy