Fix issue 778