Fix to my previous commits