Got rid of double calls.