Ok, second take on fixing the handling of comm.-

2 files changed