Fixing boxing operations