[FrogWare] Second part to previous commit.