Resolves #782

resolves #782