Updated in response to 42bd2c3