hidden week fixes #33 + fix controller loading twice