Fix/gh774