Import fix for case 12984
Fixes case 13077
Fix splitter issue with Sean