Potential bugfix for 125375