Fix bug in 9fee19e5 (TO SQUASH)