Fix #2197 (properly this time)