Fixed None handling