Fix bug in commit f83d514f3a0c279a3352a1be24a07e8fec512d23