core controller fix