#OTC-98
Bug fix: changed 2 controllers which didn't extend the new main controller