- Fixed some bugs in partial handling