hotfix: better enforcment of single source, destination