as per my comment in #269