[Update]: Fix bugs. [ArtsiomRusak]