Fix dataval and val being set correctly