Fix #3055

see #3055