Fix after sebcorbin reviewing