Fix #4077