fixing #39