fixed many sources