Fixed bug on handler introduced in the previous commit