Attempted to resolve issue 317