Fixed bug requiring val existence