Fix boxing issue