Fix None propogation