Fixing compatibility with external CoreListener