fixed source stuff