Fix None implem