More precise bugfix for 467a8e9.