I will not mark this as solution bcuz am not tested it out yet
But i think it will help, and whole problem is in eden_animal