Test fix attempt vol. 1