Fixes #2726

testing still in progress