NoneType fixed