Bug fix to support multiple controllers within a bundle