Fix #2954 (cym)