retry of fixing #6