Now it does generate properly