fixed a regression (previous did'nt work)