Finally fixed LookupError issues