Fix for #3020

still looking like a git beginner...with all those commits, arrrg.
just look at the second last, and last commit.