Fixing the sourcing problem... Maybe