Fix Controller Garbage