Bug fix coms options