[TW320] - Maybe a better hac.. handling for the previous commit