added a fix to int/uint conversion panic