grappe affinity + bug fix