Fix autoboxing