grandfahter/Mother bug fix