Fixed bug introduced by int64/int32 conversion