Fix unboxing issue; reorder methods