added hack to make coordination work