fix against latest merges