Fix for autogeneration