Potential bugfix for #1282