Fix handling of kwsplat