fix @ehsteve 's comments