NoneType Fix