fixed so gets same results as old method