Fixing another bug in unboxing