Resolve source dependency issue