Fixing Tycho's commit