Fixed boxing type change issue