I was uncertain whether ths is a Feature Request or a Bug, so it is in both categories now.
My own bug fix for the open source version: