Fixes generate