fix from mihai :-)