What's broken can always be fixed...