DD is nearly 2 and she still does it. I make sure I wash her last. I let her play and wash her just before we are finished. I also regularly soak the bath toys in disinfectant and I make sure they are put out to dry after each bath.