PDIO-298 Proper support for long values