Left out from previous commit...