Change default behavior to keep bc