Merge "Fix type conversion bug"