bug fix on core controller