Fix the coms issue