Generation fix