Begining of fix for missing sources