Fix API problem with Controller