2.9.8 - Fix of mistakes

I've realised that my previous solution to this problem was imperfect, that's why I've changed it a little bit more to handle all possibilities and actually prevent the message from appearing.