Added work-around for lang/datatypes on constructed values