Fixed Generation Issues