Upgraded fixsource plugin