[70812826] Fixed bug + added PR suggestions