Correct bug on commit 00b40d2