Fix always selects top split problem (#54)

Note that this commit fixes the problem partly, kinda halfway fix.
Need more investigation