AutoFill/AutoFill Protected after a Remake

So, we all know of the Auto fill and the auto fill protected. You get filled a game, or you fill a game and you're auto fill protected after for two games. However, if there happens to be a remake during say your turn to fill you will have auto fill protect, and it also spends an auto fill protect. I think this is a bug that needs to be fixed. If we're not earning any IP or LP or even experience for a game we didn't get to play and wasted time on, our auto fill protect charge shouldn't expire, and vice versa to someone who was filled during a remake and now have auto fill protect. I hope this made enough sense.