Fix for #433

This fixes sources from blocking each other.
The fix is combination of different fixes to make sure no source ever block another.