Fix to my previous commit... as usual