Fix: default None value replaced by dict