Fixed compability with welcome to generic controller