addressed in #50, what do you think ?