Fix V11 interface for the "weird" format. And optimise it a little (lol).