Step#2 fixed 2