FixSource for comming release 1.0