[BUGFIX] Allow custom controllers