Looks like this is the last PR I'm getting from Bandai. :-(