Fixing sourcing bug