A plausible fix for issue #9