Fix to NIL problem