Resolve issue #3909 (provided by user Clupiedae)