Small fix to core controller