Fixed None error