MODE-1911- Removed unnecessary unboxing.