update regarding to #6