Fix #5074