A fix for the original fix of issue #6