Fix #3017