and fixed one more bug