Fix with results from testing