Fixed coloring problem.. Final version