split and fix