Bugfix with source variable