alternative fix for FS#2734

this is an alternative proposition to #192