[finishes #80545816] bug fix