Minor changes on the previous issue