Step#2 fixed