I have created a patch to handle such situations but due to an enormous amount of work there has been no time to put it into use just yet.