Fix bug with previous commit 64ae7f0b