Fix for invalid generation ids