* Fix #2403 * Apply suggestions from code review Co-Authored-By: tomaka <pierre.krieger1708@gmail.com>