Fixes #1396

(Hopefully)