aligned fallback-split implementation with the fix from the previous commit