Fix a bug #166 introduced in #164