Mircea: Yet another small tweak - no2