Fix a problem introduced in the fix of #9