Fix on master (2.3)