Fixing critical bug caused a few commits back.