Fix an issue with switching to core buffer