Fix build_tuple
* Should use the casted values