Resolves #2403