Updated from master, fixed dum typo