XLS-548 attempt to fix.