Fix generics compilation issue that wasn't picked up locally