Fixed improper splitting