migrating from https://github.com/senchalabs/connect/issues/516
migrating from senchalabs/connect#516