Actually fixing #1050 this time ;)