related to the fix for #9 and #298