Pull #340 makes this asynchronous