Fix: Bug adding null