Correcting a nasty bug introduced in commit 6204c6b6416dfe4d3a0f0b0b7d6d8b5be81acefb