Resolve issue 766