resolves #5388