Fix for legacy #207