Fix controller inheritance