Address comments of @trustin