Fix #4914 (I hope)