BUGFIX on the last fix