Fixing Stefano's bug.