Removed the pointless boxing